From e2505eae88dc2b360ad59b23df4f8d2df3952d90 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Wed, 11 Jan 2017 06:49:15 +0000 Subject: [PATCH] force-use-luajit-system-cmd Gbp-Pq: Name 0004-force-use-luajit-system-cmd.patch --- cmd/Makefile.in | 6 +++--- cmd/traffic_cop/Makefile.in | 6 +++--- cmd/traffic_crashlog/Makefile.in | 6 +++--- cmd/traffic_ctl/Makefile.in | 6 +++--- cmd/traffic_layout/Makefile.in | 6 +++--- cmd/traffic_manager/Makefile.am | 11 +++++------ cmd/traffic_manager/Makefile.in | 18 ++++++++---------- cmd/traffic_top/Makefile.in | 6 +++--- cmd/traffic_via/Makefile.in | 6 +++--- cmd/traffic_wccp/Makefile.in | 6 +++--- 10 files changed, 37 insertions(+), 40 deletions(-) diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 9286018f..511eec98 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -303,9 +303,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_cop/Makefile.in b/cmd/traffic_cop/Makefile.in index c8428bef..9d039ecc 100644 --- a/cmd/traffic_cop/Makefile.in +++ b/cmd/traffic_cop/Makefile.in @@ -314,9 +314,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_crashlog/Makefile.in b/cmd/traffic_crashlog/Makefile.in index 9855cdb9..ce96f11f 100644 --- a/cmd/traffic_crashlog/Makefile.in +++ b/cmd/traffic_crashlog/Makefile.in @@ -334,9 +334,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_ctl/Makefile.in b/cmd/traffic_ctl/Makefile.in index 028f2b86..bfe043cb 100644 --- a/cmd/traffic_ctl/Makefile.in +++ b/cmd/traffic_ctl/Makefile.in @@ -317,9 +317,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_layout/Makefile.in b/cmd/traffic_layout/Makefile.in index 3ab9051c..a93fddd0 100644 --- a/cmd/traffic_layout/Makefile.in +++ b/cmd/traffic_layout/Makefile.in @@ -314,9 +314,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am index 8feddb71..6dded792 100644 --- a/cmd/traffic_manager/Makefile.am +++ b/cmd/traffic_manager/Makefile.am @@ -18,7 +18,7 @@ bin_PROGRAMS = traffic_manager AM_CPPFLAGS = \ - $(LUAJIT_CPPFLAGS) \ + $(LUA_CPPFLAGS) \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/proxy/hdrs \ @@ -29,7 +29,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/luajit/src + $(LUA_CPPFLAGS) AM_LDFLAGS = \ @EXTRA_CXX_LDFLAGS@ \ @@ -55,17 +55,16 @@ traffic_manager_LDADD = \ $(top_builddir)/proxy/shared/libdiagsconfig.a AM_LDFLAGS += \ - $(LUAJIT_LDFLAGS) + $(LUA_LDFLAGS) traffic_manager_SOURCES += \ metrics.cc traffic_manager_LDADD += \ - $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a + $(top_builddir)/lib/bindings/libbindings.la traffic_manager_LDADD +=\ - $(LIBUNWIND_LIBS) \ + $(LIBUNWIND_LIBS) $(LUA_LIBS) \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \ -lm diff --git a/cmd/traffic_manager/Makefile.in b/cmd/traffic_manager/Makefile.in index 197af2d8..f6f23023 100644 --- a/cmd/traffic_manager/Makefile.in +++ b/cmd/traffic_manager/Makefile.in @@ -173,7 +173,6 @@ traffic_manager_DEPENDENCIES = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/proxy/shared/libdiagsconfig.a \ $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -350,9 +349,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -616,7 +615,7 @@ valuesh = @valuesh@ waith = @waith@ zlibh = @zlibh@ AM_CPPFLAGS = \ - $(LUAJIT_CPPFLAGS) \ + $(LUA_CPPFLAGS) \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/proxy/hdrs \ @@ -627,10 +626,10 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/luajit/src + $(LUA_CPPFLAGS) AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LDFLAGS@ $(LUAJIT_LDFLAGS) + @OPENSSL_LDFLAGS@ $(LUA_LDFLAGS) traffic_manager_SOURCES = AddConfigFilesHere.cc MgmtHandlers.cc \ MgmtHandlers.h WebOverview.cc WebOverview.h metrics.h \ traffic_manager.cc metrics.cc @@ -641,9 +640,8 @@ traffic_manager_LDADD = $(top_builddir)/mgmt/api/libmgmtapilocal.la \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/proxy/shared/libdiagsconfig.a \ - $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a $(LIBUNWIND_LIBS) \ - @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ -lm \ + $(top_builddir)/lib/bindings/libbindings.la $(LIBUNWIND_LIBS) \ + @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ $(LUA_LIBS) -lm \ $(am__append_1) Clang_Tidy_Options = -fix -fix-errors diff --git a/cmd/traffic_top/Makefile.in b/cmd/traffic_top/Makefile.in index 4e1565ef..acea3c10 100644 --- a/cmd/traffic_top/Makefile.in +++ b/cmd/traffic_top/Makefile.in @@ -314,9 +314,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_via/Makefile.in b/cmd/traffic_via/Makefile.in index e9df8501..25bda664 100644 --- a/cmd/traffic_via/Makefile.in +++ b/cmd/traffic_via/Makefile.in @@ -517,9 +517,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/cmd/traffic_wccp/Makefile.in b/cmd/traffic_wccp/Makefile.in index 13a42116..0f17343d 100644 --- a/cmd/traffic_wccp/Makefile.in +++ b/cmd/traffic_wccp/Makefile.in @@ -314,9 +314,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ -- 2.30.2